(compute_motion, vmotion): Use Fget_char_property to test for invisibility.

diff --git a/src/indent.c b/src/indent.c
index cafe6122e915a8ff2620cd73750715e99a62b106..5824dbc99935d3a76697df3f63d383a3cfcd84c2 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -474,7 +474,7 @@ compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, ta
       while (pos == next_invisible && pos < to)
        {
          XFASTINT (position) = pos;
-         prop = Fget_text_property (position,
+         prop = Fget_char_property (position,
                                     Qinvisible,
                                     Fcurrent_buffer ());
          {
@@ -663,9 +663,9 @@ vmotion (from, vtarget, width, hscroll, window)
                      && indented_beyond_p (prevline, selective))
 #ifdef USE_TEXT_PROPERTIES
                     /* watch out for newlines with `invisible' property */
-                    || ! NILP (Fget_text_property (XFASTINT (prevline),
+                    || ! NILP (Fget_char_property (XFASTINT (prevline),
                                                    Qinvisible,
-                                                   Fcurrent_buffer ()))
+                                                   window))
 #endif
                 ))
            prevline = find_next_newline (prevline - 1, -1);
@@ -700,9 +700,9 @@ vmotion (from, vtarget, width, hscroll, window)
                   || ! indented_beyond_p (prevline, selective))
 #ifdef USE_TEXT_PROPERTIES
                  /* watch out for newlines with `invisible' property */
-                 && NILP (Fget_text_property (XFASTINT (prevline),
+                 && NILP (Fget_char_property (XFASTINT (prevline),
                                               Qinvisible,
-                                              Fcurrent_buffer ()))
+                                              window))
 #endif
                  ))
            break;